New Feature (Additonal): Search Functionality

Stylistic changes/clean up