Cleanup and integration of new bower components