How it is currently:
How it should look like IMHO: