Fixed bug and done styling