Refactor code - top bar now constantly on top

Added new and fixed tests