Done with logic for all pages. Edited basic UI layout as well.