fixing alignment
compacting some layout controls