Monday first changes. Edited front-end mostly.