Made further fixes to layout
Also fixed lasso select bug