fixed spacing, tweaked UI, added TableLayout