commit code for v1.0.5 - rework UI and added fb