restructured everything to fit mobile UI better