Few changes here and there to clean up the look and feel.