Removed TableLayout since its not necessary