Made several updates to look and feel