Finished buttons
Added hightlights and some button fixes.