Date and switch layout button mark up added