Project page layout fix

resolving bugs that was pointed on bugherd: http://www.bugherd.com/projects/39094/tasks/105?tag=project
Merge problems here.