Redesigned to remove bootstrap stuff