Admin additions and bootstrap layout

Please have a look at this branch now and let me know if you see any issues which would preclude merging now.