fexed some layout issues