Major adjustment
fixed top bar bug
fixed top bar bug