Updated the look and feel