HCSVLAB-362: Added back button
HCSVLAB-364: Added minor cosmetic things