fixed couple of issues and moved comment box to the right hand side