changed some layout issues