Adding in countdown and fixing bug with layout