Changed body selector and some fixes