Style - fix buttons, beta ribbon, 

can you review the models? I believe we still need the 'dependent's