Edited interface +  added username