Made it a bit better - css wise