Add webapp and some fixed made