fixed bugs and added styling