Adding few ui improvments // cleaning access