merge conflicts
timer updates and removeal of unneeded directives
remove swipe
update layout