Updated layout and fixed bug in firefox and IE