Top panel (not finished yet), fixes