Just my see of adjustments, if it doesn't looks good, please revert it