Fixed multiple layout issues