Updated Design and Functionality
Fixed Features