fixed bugs & prettified design

woohoo prettyness