Fixed bug and added more styling