Fix search button
Template reorganization

Signed-off-by: Lucas Tine-Beres <lucastineberes@gmail.com>