solving some Layout issues