Fixing issues with header bar, removing redundant code, fixing styles.