rearrange raidframe, put navbar in separate file