fixed some issues, added styling