Design tweaks and Firebase stuffs