Add grade properties file
Ui improvements