fix general layout