fixing random bugs
layout cleanup