Minor fixes. Custum poup still not working properly.