Rating tab merger

Trying to merge my current layout branch to master