Fixing access problem and work on the UI.