Look and feel changes

Committing before making file name changes