removed holo dark view and cleaned more code