better formatting and removed some bootstrap classes