Changed body selector and some fixes

Small fixes and improvements