Big changes

More conventional bootstrap-oriented layout