Added a few tests and improved css