redirection bug fixed
layout updates
height updates
layout updates