Third Commit - Updated

Small bug fixes with address bar.