fixed bugs and improved styling