Modified site structure, and did more work on timepicer