refactored

Signed-off-by: Chan Jun Wei <chanjunweimy@gmail.com>
pushing andrew's code! FindFetch's apps GUI!

Signed-off-by: Chan Jun Wei <chanjunweimy@gmail.com>