-Fixed some layout issues