Merge epicness and master

Added new frontend design in epicness, must merge it to master