Clean code

and display subject in the main page