Fixed style/display issues