Cleaned up/Remove some codes, added background color