updated some layout issues