Added a lab view
Improvements and bug fixes