Just some final touches for now

Made screen detection neater