Styling and some route fixing

@QuigProQuo @mendoncakr