Fixing ugly stuff
Fixing some nice design