Added submit/cancel styles & fixed color bug