Clean up default package
Add better look and feel for UI