Fix layout problems in main page