Code cleanup, FW update, mobile layout update