Create more flexible borders and reorganize the main view