Update margins and reshape viewfinder
Use lines instead of the ugly box
More margin fixes