Fixed a few Bugs and made it look better