Styling tweaks
More database modelling