working on bugs after first merge, backgrounds fixed, active tab...