fixed layout a little bit