fixed layabout bugs