Initial work on refreshed layout based on Bootstrap