FInished with initial styling

Now to integrate with Selby's changes