Finalized some of the look and feel