Fixed some issue with the current layout.