fix layout issues in main