Fixed some behavior and styling