Added Buttons for Time / Added Spinner for PSP
Merge