Fixed buttons overlapping to footer on smaller screens
Merge branch 'dev' of https://github.com/MitchelCabuloy/OnTrack into dev