Remove white space, fix block position