bugfix
layout updated and fixed