Revert 2da2415..0d9687b

This rolls back to commit 2da2415d377f8c38ee36287ec3bd88fafc0f62b8.
Fixed timer position and other ui stuff