Update changes from Tuesday call (button corners etc)
Integrate Erock + FK changes