Bug fixes, added styling