layout pretty fixing and comments added