Finalizing layout issues