Small adjustments to layout and unaccept bug fix