Fixed bug and did some styling work