Added Timer and Changed Button Layout