added and fixed methods/UI