Layout fixes for table