resolving some layout issues